# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/03/12 16:09:53-07:00 bjorn.helgaas@hp.com 
#   Merge hp.com:/home/helgaas/linux/ia64-extras
#   into hp.com:/home/helgaas/linux/linux-ia64-2.4
# 
# net/ipv4/netfilter/ip_fw_compat_masq.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# mm/page_alloc.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# mm/mremap.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# mm/mmap.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# mm/memory.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# kernel/sysctl.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# kernel/softirq.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# kernel/sched.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# kernel/printk.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# init/main.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/linux/sysctl.h
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -1
#   Auto merged
# 
# include/linux/sched.h
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/linux/pci_ids.h
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -1
#   Auto merged
# 
# include/linux/pci.h
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/linux/mm.h
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/linux/irq_cpustat.h
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/linux/fs.h
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/linux/agp_backend.h
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/asm-i386/mpspec.h
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/acpi/acpi_drivers.h
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/acpi/acglobal.h
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# fs/proc/base.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# fs/proc/array.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# fs/Config.in
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/scsi/sym53c8xx_2/sym_glue.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/scsi/scsi_merge.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/scsi/qla1280.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/scsi/megaraid.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/scsi/Makefile
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/scsi/Config.in
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/pci/pci.c
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/net/tg3.h
#   2005/03/12 16:09:49-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/net/tg3.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/net/Makefile
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/char/serial.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/char/agp/agpgart_be.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/char/agp/agp.h
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/utilities/utglobal.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/system.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/osl.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/hardware/hwsleep.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/events/evmisc.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/dispatcher/dsopcode.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/bus.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/Makefile
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/ia64/mm/init.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/ia64/config.in
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/i386/kernel/pci-pc.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/i386/kernel/pci-irq.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/i386/kernel/mpparse.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/i386/kernel/io_apic.c
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/i386/config.in
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Documentation/Configure.help
#   2005/03/12 16:09:48-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Makefile
#   2005/03/12 16:09:47-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# ChangeSet
#   2005/03/12 15:37:25-07:00 bjorn.helgaas@hp.com 
#   Merge to 2.4.29
# 
# mm/mmap.c
#   2005/03/12 15:37:22-07:00 bjorn.helgaas@hp.com +0 -0
#   Resolve merge conflict.
# 
# include/linux/sysctl.h
#   2005/03/12 15:37:22-07:00 bjorn.helgaas@hp.com +1 -1
#   Move VM_HUGETLB_PAGES from 23 to 24 because upstream added
#   VM_ANON_LRU at 23.
# 
# net/ipv4/netfilter/ip_fw_compat_masq.c
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# mm/page_alloc.c
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# mm/mremap.c
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# mm/memory.c
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# kernel/sysctl.c
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# kernel/softirq.c
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# kernel/sched.c
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# kernel/printk.c
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# init/main.c
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/linux/sched.h
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/linux/pci_ids.h
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +1 -1
#   Auto merged
# 
# include/linux/pci.h
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/linux/mm.h
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/linux/irq_cpustat.h
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/linux/fs.h
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/linux/agp_backend.h
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/asm-i386/mpspec.h
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/acpi/acpi_drivers.h
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# include/acpi/acglobal.h
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# fs/proc/base.c
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# fs/proc/array.c
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# fs/Config.in
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/scsi/sym53c8xx_2/sym_glue.c
#   2005/03/12 15:33:19-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/scsi/scsi_merge.c
#   2005/03/12 15:33:18-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/scsi/qla1280.c
#   2005/03/12 15:33:18-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/scsi/megaraid.c
#   2005/03/12 15:33:18-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/scsi/Makefile
#   2005/03/12 15:33:18-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/scsi/Config.in
#   2005/03/12 15:33:18-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/pci/pci.c
#   2005/03/12 15:33:18-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/net/tg3.h
#   2005/03/12 15:33:18-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/net/tg3.c
#   2005/03/12 15:33:18-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/net/Makefile
#   2005/03/12 15:33:18-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/char/serial.c
#   2005/03/12 15:33:18-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/char/agp/agpgart_be.c
#   2005/03/12 15:33:18-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/char/agp/agp.h
#   2005/03/12 15:33:18-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/utilities/utglobal.c
#   2005/03/12 15:33:18-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/system.c
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/osl.c
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/hardware/hwsleep.c
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/events/evmisc.c
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/dispatcher/dsopcode.c
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -2
#   Auto merged
# 
# drivers/acpi/bus.c
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# drivers/acpi/Makefile
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/ia64/mm/init.c
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/ia64/config.in
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/i386/kernel/pci-pc.c
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/i386/kernel/pci-irq.c
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/i386/kernel/mpparse.c
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/i386/kernel/io_apic.c
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# arch/i386/config.in
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Documentation/Configure.help
#   2005/03/12 15:33:17-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
# 
# Makefile
#   2005/03/12 15:33:16-07:00 bjorn.helgaas@hp.com +0 -0
#   Auto merged
#